bitkeeper revision 1.1726.1.4 (42b9a3227hiEkDxIFEfJ234PDK9C8w)

Enable NX bit support in 32-bit pae mode.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>

diff --git a/xen/include/asm-x86/x86_32/page-2level.h b/xen/include/asm-x86/x86_32/page-2level.h
index 34128f24fa334ca15a1fd9085667f8b99009d59b..4f11ac49ca10bb757f114478b9bd2a0f7d1204fe 100644 (file)
--- a/xen/include/asm-x86/x86_32/page-2level.h
+++ b/xen/include/asm-x86/x86_32/page-2level.h
@@ -46,6 +46,8 @@ typedef l2_pgentry_t root_pgentry_t;
  *  12-bit flags = (pte[11:0])
  */
 
+#define _PAGE_NX                0U
+
 /* Extract flags into 12-bit integer, or turn 12-bit flags into a pte mask. */
 #define get_pte_flags(x) ((int)(x) & 0xFFF)
 #define put_pte_flags(x) ((intpte_t)((x) & 0xFFF))

diff --git a/xen/include/asm-x86/x86_32/page-3level.h b/xen/include/asm-x86/x86_32/page-3level.h
index 1fc423c07378df8496d614114ee3c3f0676aca95..79b14169e947a7a15a2f1777b5ff8ddea66d3102 100644 (file)
--- a/xen/include/asm-x86/x86_32/page-3level.h
+++ b/xen/include/asm-x86/x86_32/page-3level.h
@@ -59,6 +59,8 @@ typedef l3_pgentry_t root_pgentry_t;
  *  32-bit flags = (pte[63:44],pte[11:0])
  */
 
+#define _PAGE_NX (cpu_has_nx ? (1<<31) : 0)
+
 /* Extract flags into 32-bit integer, or turn 32-bit flags into a pte mask. */
 #define get_pte_flags(x) (((int)((x) >> 32) & ~0xFFF) | ((int)(x) & 0xFFF))
 #define put_pte_flags(x) (((intpte_t)((x) & ~0xFFF) << 40) | ((x) & 0xFFF))

diff --git a/xen/include/asm-x86/x86_32/page.h b/xen/include/asm-x86/x86_32/page.h
index 9546706876260818b96af5de6b8a0a509c5038f1..41396fa6a4a36959110f389ede5ac673a920de76 100644 (file)
--- a/xen/include/asm-x86/x86_32/page.h
+++ b/xen/include/asm-x86/x86_32/page.h
@@ -7,8 +7,6 @@
 #define VADDR_BITS              32
 #define VADDR_MASK              (~0UL)
 
-#define _PAGE_NX                0U
-
 #include <xen/config.h>
 #ifdef CONFIG_X86_PAE
 # include <asm/x86_32/page-3level.h>